From 405df7f7dbae2e6e70063f944b1415072f161ed3 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan Date: Fri, 1 Jun 2007 05:02:05 +0000 Subject: [PATCH] use text colors from widget style to draw cursor instead of hardcoded 2007-05-31 Yevgen Muntyan * gtk/gtkstyle.c (get_insertion_cursor_gc): use text colors from widget style to draw cursor instead of hardcoded black and grey (#79585, comment #30). svn path=/trunk/; revision=17998 --- ChangeLog | 6 ++++++ gtk/gtkstyle.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf18258e31..66edb1dd7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-31 Yevgen Muntyan + + * gtk/gtkstyle.c (get_insertion_cursor_gc): use text colors from + widget style to draw cursor instead of hardcoded black and grey + (#79585, comment #30). + 2007-06-01 Kristian Rietveld * gtk/gtkcellrenderertext.c (get_size): transform the ink_rect using diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index a673e4fcfd..763cc37086 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -6641,24 +6641,26 @@ get_insertion_cursor_gc (GtkWidget *widget, } } + /* Cursors in text widgets are drawn only in NORMAL state, + * so we can use text[GTK_STATE_NORMAL] as text color here */ if (is_primary) { if (!cursor_info->primary_gc) cursor_info->primary_gc = make_cursor_gc (widget, "cursor-color", - &widget->style->black); - + &widget->style->text[GTK_STATE_NORMAL]); + return cursor_info->primary_gc; } else { - static const GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 }; - if (!cursor_info->secondary_gc) cursor_info->secondary_gc = make_cursor_gc (widget, "secondary-cursor-color", - &gray); - + /* text_aa is the average of text and base colors, + * in usual black-on-white case it's grey. */ + &widget->style->text_aa[GTK_STATE_NORMAL]); + return cursor_info->secondary_gc; } } -- 2.30.2